Stop the kernel and ramdisk from being nuked if the kernel_external bootloader

setting is being used.

From Jim Fehlig <jfehlig@novell.com>.
Signed-off-by: Ewan Mellor <ewan@xensource.com>

diff --git a/tools/python/xen/xend/XendDomainInfo.py b/tools/python/xen/xend/XendDomainInfo.py
index 532ce81264cb748d180286f1afcde44306515ea9..958c5cf8f84086c5dc48cdc753147f8d7bec59e0 100644 (file)
--- a/tools/python/xen/xend/XendDomainInfo.py
+++ b/tools/python/xen/xend/XendDomainInfo.py
@@ -1318,7 +1318,7 @@ class XendDomainInfo:
 
             self._createDevices()
 
-            if self.info['bootloader']:
+            if self.info['bootloader'] not in [None, 'kernel_external']:
                 self.image.cleanupBootloading()
 
             self.info['start_time'] = time.time()
@@ -1326,7 +1326,8 @@ class XendDomainInfo:
             self._stateSet(DOM_STATE_RUNNING)
         except RuntimeError, exn:
             log.exception("XendDomainInfo.initDomain: exception occurred")
-            if self.info['bootloader'] and self.image is not None:
+            if self.info['bootloader'] not in [None, 'kernel_external'] \
+                   and self.image is not None:
                 self.image.cleanupBootloading()
             raise VmError(str(exn))